| commit | 7c73c663897cfb2796fa93efc40ebe4ea33a3db1 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Fri Jan 19 00:37:50 2007 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Fri Jan 19 00:37:50 2007 |
| tree | 1f9d377ee80bb9eada67fc063f87c517dffa8832 | |
| parent | 2d47c62a3df350dff294aba379e2a5430fd130d1 [diff] [blame] |
Autogenerated HTML docs for v1.5.0-rc1-g72fe
diff --git a/git-merge-file.txt b/git-merge-file.txt index 29d3faa..31882ab 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt
@@ -3,7 +3,7 @@ NAME ---- -git-merge-file - three-way file merge +git-merge-file - Run a three-way file merge SYNOPSIS